Trap the case where there is no default widget and the entry is the focus

Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.c (gtk_entry_real_activate): Trap the
        case where there is no default widget and the entry
        is the focus widget, since this also causes infinite
        recursion. (#69158)

diff --git a/ChangeLog b/ChangeLog
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8d15a4bd8ab8e34bcffe16a4e81f1f92b8b06c03..5d3fdf389e7122243ece93f6da66b3565dea925b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Jan 21 11:56:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_real_activate): Trap the 
+       case where there is no default widget and the entry
+       is the focus widget, since this also causes infinite
+       recursion. (#69158)
+
 Mon Jan 21 11:46:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdk.c (gdk_init_check): Set the fallback program class here,

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 77c04a902020b174938c9f09284fb51e1f02d8aa..1d1f7d8c353ac4bae3df461babe9e2dfcb30eaf9 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2229,7 +2229,9 @@ gtk_entry_real_activate (GtkEntry *entry)
        {
          window = GTK_WINDOW (toplevel);
       
-         if (window && window->default_widget != widget)
+         if (window &&
+             widget != window->default_widget &&
+             !(!window->default_widget && widget == window->focus_widget))
            gtk_window_activate_default (window);
        }
     }